diff --git a/CMakeLists.txt b/CMakeLists.txt
index 48d1d31..963cb03 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,23 +17,10 @@
        FORCE)
 endif(NOT CMAKE_BUILD_TYPE)
 
-if(NOT WITH_TEST)
-  message(STATUS "Building without test. To enable test build use: -DWITH_TEST=True")
-  set(WITH_TEST False CACHE STRING
-    "Chose to build with or without test executable"
-    FORCE)
-endif(NOT WITH_TEST)
-
 option(WITH_LIBCXX "Building with clang++ and libc++(in Linux). To enable with: -DWITH_LIBCXX=On" On)
 
 project(SURELOG)
 
-#file(STRINGS "VERSION" SURELOG_VERSION)
-
-if (WITH_TEST)
-
-endif(WITH_TEST)
-
 set(CMAKE_CXX_STANDARD 11)
 
 cmake_minimum_required(VERSION 3.0)
@@ -89,22 +76,29 @@
 enable_testing()
 #add_test(NAME GenerateFromGrammar COMMAND ${Java_JAVA_EXECUTABLE}  org.antlr.v4.Tool -Dlanguage=Cpp *.g4)
 
-add_custom_target(CreateDirectories)
+add_custom_target(GenerateParser DEPENDS ${PROJECT_SOURCE_DIR}/src/parser/dummy1 ${PROJECT_SOURCE_DIR}/src/SourceCompile/dummy2)
 
-add_custom_target(GenerateParser DEPENDS ${PROJECT_SOURCE_DIR}/src/SourceCompile/VObjectTypes.cpp)
-add_custom_command(OUTPUT ${PROJECT_SOURCE_DIR}/src/SourceCompile/VObjectTypes.cpp
+add_custom_command(OUTPUT ${PROJECT_SOURCE_DIR}/src/parser/dummy1
+  WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/grammar/"
   COMMAND echo "       Parser Generation..."
   COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_SOURCE_DIR}/src/parser/
-  COMMAND java -jar ${ANTLR_JAR_LOCATION} -Werror -Dlanguage=Cpp -o ${PROJECT_SOURCE_DIR}/src/parser/  ${PROJECT_SOURCE_DIR}/grammar/SV3_1aPpLexer.g4  ${PROJECT_SOURCE_DIR}/grammar/SV3_1aLexer.g4 ${PROJECT_SOURCE_DIR}/grammar/SV3_1aSplitterLexer.g4 ${PROJECT_SOURCE_DIR}/grammar/SV3_1aPpParser.g4 ${PROJECT_SOURCE_DIR}/grammar/SV3_1aParser.g4 ${PROJECT_SOURCE_DIR}/grammar/SV3_1aSplitterParser.g4
+  COMMAND java -jar ${ANTLR_JAR_LOCATION} -Werror -Dlanguage=Cpp -o ${PROJECT_SOURCE_DIR}/src/parser/ SV3_1aPpLexer.g4 SV3_1aLexer.g4 SV3_1aSplitterLexer.g4 SV3_1aPpParser.g4 SV3_1aParser.g4 SV3_1aSplitterParser.g4
+  DEPENDS  ${PROJECT_SOURCE_DIR}/grammar/SV3_1aPpLexer.g4 ${PROJECT_SOURCE_DIR}/grammar/SV3_1aLexer.g4 ${PROJECT_SOURCE_DIR}/grammar/SV3_1aSplitterLexer.g4 ${PROJECT_SOURCE_DIR}/grammar/SV3_1aPpParser.g4 ${PROJECT_SOURCE_DIR}/grammar/SV3_1aParser.g4 ${PROJECT_SOURCE_DIR}/grammar/SV3_1aSplitterParser.g4
+  COMMAND touch ${PROJECT_SOURCE_DIR}/src/parser/dummy1
+  COMMAND echo "       Parser Generated."
+)
+
+add_custom_command(OUTPUT ${PROJECT_SOURCE_DIR}/src/SourceCompile/dummy2
+  WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/src/"
   COMMAND echo "       Serializer, Parser Listener, code generation..."
   COMMAND SourceCompile/generate_parser_listener.tcl ;
   COMMAND API/generate_python_listener_api.tcl ;
   COMMAND echo "       Python API Generation..."
   COMMAND ${SWIG_EXECUTABLE}  -c++ -python -o API/slapi_wrap.cxx API/slapi.i ;
   COMMAND API/embed_python_api.tcl
-  WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/src/"
+  COMMAND touch ${PROJECT_SOURCE_DIR}/src/SourceCompile/dummy2
   COMMAND echo "       Code Generation completed"
-  DEPENDS ${PROJECT_SOURCE_DIR}/grammar/SV3_1aPpLexer.g4 ${PROJECT_SOURCE_DIR}/grammar/SV3_1aLexer.g4 ${PROJECT_SOURCE_DIR}/grammar/SV3_1aSplitterLexer.g4 ${PROJECT_SOURCE_DIR}/grammar/SV3_1aPpParser.g4 ${PROJECT_SOURCE_DIR}/grammar/SV3_1aParser.g4 ${PROJECT_SOURCE_DIR}/grammar/SV3_1aSplitterParser.g4 ${PROJECT_SOURCE_DIR}/src/API/slapi.i
+  DEPENDS ${PROJECT_SOURCE_DIR}/grammar/SV3_1aPpLexer.g4 ${PROJECT_SOURCE_DIR}/grammar/SV3_1aLexer.g4 ${PROJECT_SOURCE_DIR}/grammar/SV3_1aSplitterLexer.g4 ${PROJECT_SOURCE_DIR}/grammar/SV3_1aPpParser.g4 ${PROJECT_SOURCE_DIR}/grammar/SV3_1aParser.g4 ${PROJECT_SOURCE_DIR}/grammar/SV3_1aSplitterParser.g4 ${PROJECT_SOURCE_DIR}/src/API/slapi.i ${PROJECT_SOURCE_DIR}/src/parser/dummy1
  )
 
 include_directories(${PROJECT_SOURCE_DIR}/src)
@@ -173,6 +167,7 @@
 add_dependencies(surelog flatc)
 add_dependencies(surelog antlr4_static)
 add_dependencies(surelog flatbuffers)
+add_dependencies(GenerateParser antlr4_static)
 add_dependencies(surelog GenerateParser)
 add_dependencies(surelog GenerateSerializer)
 
diff --git a/src/parser/SV3_1aLexer.cpp b/src/parser/SV3_1aLexer.cpp
index 9cae3af..66e9fe2 100644
--- a/src/parser/SV3_1aLexer.cpp
+++ b/src/parser/SV3_1aLexer.cpp
@@ -1,5 +1,5 @@
 
-// Generated from /home/alain/Surelog/grammar/SV3_1aLexer.g4 by ANTLR 4.7.2
+// Generated from SV3_1aLexer.g4 by ANTLR 4.7.2
 
 
 #include "SV3_1aLexer.h"
diff --git a/src/parser/SV3_1aLexer.h b/src/parser/SV3_1aLexer.h
index 0752d25..6ead13d 100644
--- a/src/parser/SV3_1aLexer.h
+++ b/src/parser/SV3_1aLexer.h
@@ -1,5 +1,5 @@
 
-// Generated from /home/alain/Surelog/grammar/SV3_1aLexer.g4 by ANTLR 4.7.2
+// Generated from SV3_1aLexer.g4 by ANTLR 4.7.2
 
 #pragma once
 
diff --git a/src/parser/SV3_1aParser.cpp b/src/parser/SV3_1aParser.cpp
index b96cfb7..d361a2b 100644
--- a/src/parser/SV3_1aParser.cpp
+++ b/src/parser/SV3_1aParser.cpp
@@ -1,5 +1,5 @@
 
-// Generated from /home/alain/Surelog/grammar/SV3_1aParser.g4 by ANTLR 4.7.2
+// Generated from SV3_1aParser.g4 by ANTLR 4.7.2
 
 
 #include "SV3_1aParserListener.h"
diff --git a/src/parser/SV3_1aParser.h b/src/parser/SV3_1aParser.h
index 692a631..767c938 100644
--- a/src/parser/SV3_1aParser.h
+++ b/src/parser/SV3_1aParser.h
@@ -1,5 +1,5 @@
 
-// Generated from /home/alain/Surelog/grammar/SV3_1aParser.g4 by ANTLR 4.7.2
+// Generated from SV3_1aParser.g4 by ANTLR 4.7.2
 
 #pragma once
 
diff --git a/src/parser/SV3_1aParserBaseListener.cpp b/src/parser/SV3_1aParserBaseListener.cpp
index 8ed1556..2e0614a 100644
--- a/src/parser/SV3_1aParserBaseListener.cpp
+++ b/src/parser/SV3_1aParserBaseListener.cpp
@@ -1,5 +1,5 @@
 
-// Generated from /home/alain/Surelog/grammar/SV3_1aParser.g4 by ANTLR 4.7.2
+// Generated from SV3_1aParser.g4 by ANTLR 4.7.2
 
 
 #include "SV3_1aParserBaseListener.h"
diff --git a/src/parser/SV3_1aParserBaseListener.h b/src/parser/SV3_1aParserBaseListener.h
index bfe80ad..9a010a6 100644
--- a/src/parser/SV3_1aParserBaseListener.h
+++ b/src/parser/SV3_1aParserBaseListener.h
@@ -1,5 +1,5 @@
 
-// Generated from /home/alain/Surelog/grammar/SV3_1aParser.g4 by ANTLR 4.7.2
+// Generated from SV3_1aParser.g4 by ANTLR 4.7.2
 
 #pragma once
 
diff --git a/src/parser/SV3_1aParserListener.cpp b/src/parser/SV3_1aParserListener.cpp
index c062014..447a2f1 100644
--- a/src/parser/SV3_1aParserListener.cpp
+++ b/src/parser/SV3_1aParserListener.cpp
@@ -1,5 +1,5 @@
 
-// Generated from /home/alain/Surelog/grammar/SV3_1aParser.g4 by ANTLR 4.7.2
+// Generated from SV3_1aParser.g4 by ANTLR 4.7.2
 
 
 #include "SV3_1aParserListener.h"
diff --git a/src/parser/SV3_1aParserListener.h b/src/parser/SV3_1aParserListener.h
index 79e3655..627e875 100644
--- a/src/parser/SV3_1aParserListener.h
+++ b/src/parser/SV3_1aParserListener.h
@@ -1,5 +1,5 @@
 
-// Generated from /home/alain/Surelog/grammar/SV3_1aParser.g4 by ANTLR 4.7.2
+// Generated from SV3_1aParser.g4 by ANTLR 4.7.2
 
 #pragma once
 
diff --git a/src/parser/SV3_1aPpLexer.cpp b/src/parser/SV3_1aPpLexer.cpp
index c50ea75..34cde50 100644
--- a/src/parser/SV3_1aPpLexer.cpp
+++ b/src/parser/SV3_1aPpLexer.cpp
@@ -1,5 +1,5 @@
 
-// Generated from /home/alain/Surelog/grammar/SV3_1aPpLexer.g4 by ANTLR 4.7.2
+// Generated from SV3_1aPpLexer.g4 by ANTLR 4.7.2
 
 
 #include "SV3_1aPpLexer.h"
diff --git a/src/parser/SV3_1aPpLexer.h b/src/parser/SV3_1aPpLexer.h
index 111f172..51bfe15 100644
--- a/src/parser/SV3_1aPpLexer.h
+++ b/src/parser/SV3_1aPpLexer.h
@@ -1,5 +1,5 @@
 
-// Generated from /home/alain/Surelog/grammar/SV3_1aPpLexer.g4 by ANTLR 4.7.2
+// Generated from SV3_1aPpLexer.g4 by ANTLR 4.7.2
 
 #pragma once
 
diff --git a/src/parser/SV3_1aPpParser.cpp b/src/parser/SV3_1aPpParser.cpp
index b3fae3a..ab858e4 100644
--- a/src/parser/SV3_1aPpParser.cpp
+++ b/src/parser/SV3_1aPpParser.cpp
@@ -1,5 +1,5 @@
 
-// Generated from /home/alain/Surelog/grammar/SV3_1aPpParser.g4 by ANTLR 4.7.2
+// Generated from SV3_1aPpParser.g4 by ANTLR 4.7.2
 
 
 #include "SV3_1aPpParserListener.h"
diff --git a/src/parser/SV3_1aPpParser.h b/src/parser/SV3_1aPpParser.h
index 03bd477..9112fb5 100644
--- a/src/parser/SV3_1aPpParser.h
+++ b/src/parser/SV3_1aPpParser.h
@@ -1,5 +1,5 @@
 
-// Generated from /home/alain/Surelog/grammar/SV3_1aPpParser.g4 by ANTLR 4.7.2
+// Generated from SV3_1aPpParser.g4 by ANTLR 4.7.2
 
 #pragma once
 
diff --git a/src/parser/SV3_1aPpParserBaseListener.cpp b/src/parser/SV3_1aPpParserBaseListener.cpp
index 1932dc2..464db61 100644
--- a/src/parser/SV3_1aPpParserBaseListener.cpp
+++ b/src/parser/SV3_1aPpParserBaseListener.cpp
@@ -1,5 +1,5 @@
 
-// Generated from /home/alain/Surelog/grammar/SV3_1aPpParser.g4 by ANTLR 4.7.2
+// Generated from SV3_1aPpParser.g4 by ANTLR 4.7.2
 
 
 #include "SV3_1aPpParserBaseListener.h"
diff --git a/src/parser/SV3_1aPpParserBaseListener.h b/src/parser/SV3_1aPpParserBaseListener.h
index 25cb6b2..9f5c9fa 100644
--- a/src/parser/SV3_1aPpParserBaseListener.h
+++ b/src/parser/SV3_1aPpParserBaseListener.h
@@ -1,5 +1,5 @@
 
-// Generated from /home/alain/Surelog/grammar/SV3_1aPpParser.g4 by ANTLR 4.7.2
+// Generated from SV3_1aPpParser.g4 by ANTLR 4.7.2
 
 #pragma once
 
diff --git a/src/parser/SV3_1aPpParserListener.cpp b/src/parser/SV3_1aPpParserListener.cpp
index 148c976..a06ba3c 100644
--- a/src/parser/SV3_1aPpParserListener.cpp
+++ b/src/parser/SV3_1aPpParserListener.cpp
@@ -1,5 +1,5 @@
 
-// Generated from /home/alain/Surelog/grammar/SV3_1aPpParser.g4 by ANTLR 4.7.2
+// Generated from SV3_1aPpParser.g4 by ANTLR 4.7.2
 
 
 #include "SV3_1aPpParserListener.h"
diff --git a/src/parser/SV3_1aPpParserListener.h b/src/parser/SV3_1aPpParserListener.h
index e8b40a5..fa8bc92 100644
--- a/src/parser/SV3_1aPpParserListener.h
+++ b/src/parser/SV3_1aPpParserListener.h
@@ -1,5 +1,5 @@
 
-// Generated from /home/alain/Surelog/grammar/SV3_1aPpParser.g4 by ANTLR 4.7.2
+// Generated from SV3_1aPpParser.g4 by ANTLR 4.7.2
 
 #pragma once
 
diff --git a/src/parser/SV3_1aSplitterLexer.cpp b/src/parser/SV3_1aSplitterLexer.cpp
index 133a600..86b66b5 100644
--- a/src/parser/SV3_1aSplitterLexer.cpp
+++ b/src/parser/SV3_1aSplitterLexer.cpp
@@ -1,5 +1,5 @@
 
-// Generated from /home/alain/Surelog/grammar/SV3_1aSplitterLexer.g4 by ANTLR 4.7.2
+// Generated from SV3_1aSplitterLexer.g4 by ANTLR 4.7.2
 
 
 #include "SV3_1aSplitterLexer.h"
diff --git a/src/parser/SV3_1aSplitterLexer.h b/src/parser/SV3_1aSplitterLexer.h
index badb5f8..a078f01 100644
--- a/src/parser/SV3_1aSplitterLexer.h
+++ b/src/parser/SV3_1aSplitterLexer.h
@@ -1,5 +1,5 @@
 
-// Generated from /home/alain/Surelog/grammar/SV3_1aSplitterLexer.g4 by ANTLR 4.7.2
+// Generated from SV3_1aSplitterLexer.g4 by ANTLR 4.7.2
 
 #pragma once
 
diff --git a/src/parser/SV3_1aSplitterParser.cpp b/src/parser/SV3_1aSplitterParser.cpp
index a098ff9..0d940e8 100644
--- a/src/parser/SV3_1aSplitterParser.cpp
+++ b/src/parser/SV3_1aSplitterParser.cpp
@@ -1,5 +1,5 @@
 
-// Generated from /home/alain/Surelog/grammar/SV3_1aSplitterParser.g4 by ANTLR 4.7.2
+// Generated from SV3_1aSplitterParser.g4 by ANTLR 4.7.2
 
 
 #include "SV3_1aSplitterParserListener.h"
diff --git a/src/parser/SV3_1aSplitterParser.h b/src/parser/SV3_1aSplitterParser.h
index 7d44302..63b278a 100644
--- a/src/parser/SV3_1aSplitterParser.h
+++ b/src/parser/SV3_1aSplitterParser.h
@@ -1,5 +1,5 @@
 
-// Generated from /home/alain/Surelog/grammar/SV3_1aSplitterParser.g4 by ANTLR 4.7.2
+// Generated from SV3_1aSplitterParser.g4 by ANTLR 4.7.2
 
 #pragma once
 
diff --git a/src/parser/SV3_1aSplitterParserBaseListener.cpp b/src/parser/SV3_1aSplitterParserBaseListener.cpp
index 81c8136..0bb42bf 100644
--- a/src/parser/SV3_1aSplitterParserBaseListener.cpp
+++ b/src/parser/SV3_1aSplitterParserBaseListener.cpp
@@ -1,5 +1,5 @@
 
-// Generated from /home/alain/Surelog/grammar/SV3_1aSplitterParser.g4 by ANTLR 4.7.2
+// Generated from SV3_1aSplitterParser.g4 by ANTLR 4.7.2
 
 
 #include "SV3_1aSplitterParserBaseListener.h"
diff --git a/src/parser/SV3_1aSplitterParserBaseListener.h b/src/parser/SV3_1aSplitterParserBaseListener.h
index 6db3267..31a590d 100644
--- a/src/parser/SV3_1aSplitterParserBaseListener.h
+++ b/src/parser/SV3_1aSplitterParserBaseListener.h
@@ -1,5 +1,5 @@
 
-// Generated from /home/alain/Surelog/grammar/SV3_1aSplitterParser.g4 by ANTLR 4.7.2
+// Generated from SV3_1aSplitterParser.g4 by ANTLR 4.7.2
 
 #pragma once
 
diff --git a/src/parser/SV3_1aSplitterParserListener.cpp b/src/parser/SV3_1aSplitterParserListener.cpp
index 160e852..0bacb9e 100644
--- a/src/parser/SV3_1aSplitterParserListener.cpp
+++ b/src/parser/SV3_1aSplitterParserListener.cpp
@@ -1,5 +1,5 @@
 
-// Generated from /home/alain/Surelog/grammar/SV3_1aSplitterParser.g4 by ANTLR 4.7.2
+// Generated from SV3_1aSplitterParser.g4 by ANTLR 4.7.2
 
 
 #include "SV3_1aSplitterParserListener.h"
diff --git a/src/parser/SV3_1aSplitterParserListener.h b/src/parser/SV3_1aSplitterParserListener.h
index 0d4da14..7c34ce8 100644
--- a/src/parser/SV3_1aSplitterParserListener.h
+++ b/src/parser/SV3_1aSplitterParserListener.h
@@ -1,5 +1,5 @@
 
-// Generated from /home/alain/Surelog/grammar/SV3_1aSplitterParser.g4 by ANTLR 4.7.2
+// Generated from SV3_1aSplitterParser.g4 by ANTLR 4.7.2
 
 #pragma once