diff --git a/r3-completion.bash b/r3-completion.bash
index 325b7c5..a6ee1a3 100755
--- a/r3-completion.bash
+++ b/r3-completion.bash
@@ -17,7 +17,7 @@ r3_completions() {
   fi
 
   if [ "${#COMP_WORDS[@]}" == "4" ]; then
-    COMPREPLY=($(compgen -W "extends normal system static" "${COMP_WORDS[3]}"))
+    COMPREPLY=($(compgen -W "extends normal system static system-base r3-base" "${COMP_WORDS[3]}"))
   fi
 
   if [ "${#COMP_WORDS[@]}" == "5" ] && [ "${COMP_WORDS[3]}" == "extends" ] ; then
diff --git a/r3-libs/r3-v2 b/r3-libs/r3-v2
index f6adda0..574a4d7 160000
--- a/r3-libs/r3-v2
+++ b/r3-libs/r3-v2
@@ -1 +1 @@
-Subproject commit f6adda0a7b1a5605050cdcf6f9f2aed7f0a57ad3
+Subproject commit 574a4d7c7001efd89ddbf316969cf5c2bd538052
diff --git a/r3.sh b/r3.sh
index dd07b0f..9111e7e 100755
--- a/r3.sh
+++ b/r3.sh
@@ -120,13 +120,22 @@ then
     fi
 
     if [ "${ARG2}" = "system" ]; then
+      CLASS_NAME="${ARG1}"
+      FILE_NAME="r3$(echo "${CLASS_NAME}" | sed 's/\([A-Z]\)/-\1/g' |  awk '{print tolower($0)}').js"
       INCLUDE_PATH="../$INCLUDE_PATH"
       R3_FOLDER=$R3_SYSTEM_FOLDER
-      EXTEND_CLASS="${ARG3}"
+      EXTEND_CLASS="System"
       EXTEND_CLASS_FILE_NAME="r3$(echo "${EXTEND_CLASS}" | sed 's/\([A-Z]\)/-\1/g' |  awk '{print tolower($0)}').js"
       echo "Creating system ${CLASS_NAME} based on template ${TEMPLATE} extending ${EXTEND_CLASS} and saving to ${R3_FOLDER}${FILE_NAME}"
     fi
 
+    if [ "${ARG2}" = "system-base" ]; then
+      FILE_NAME="r3$(echo "${CLASS_NAME}" | sed 's/\([A-Z]\)/-\1/g' |  awk '{print tolower($0)}').js"
+      INCLUDE_PATH="../$INCLUDE_PATH"
+      R3_FOLDER=$R3_SYSTEM_FOLDER
+      echo "Creating system ${CLASS_NAME} based on template ${TEMPLATE} extending ${EXTEND_CLASS} and saving to ${R3_FOLDER}${FILE_NAME}"
+    fi
+
     cp "${TEMPLATE_FOLDER}${TEMPLATE}" "${R3_FOLDER}${FILE_NAME}"
 
     if [ "${EXTEND_CLASS}" = "Event" ]; then
@@ -300,6 +309,10 @@ then
 
     done
 
+    echo "building graph"
+
+    ./update_templates.php all build-graph
+
     cd - 2>&1 || exit 3
 
     exit 0;