diff --git a/.gitignore b/.gitignore
index 48010bb..7acc024 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,4 +32,6 @@ build/
 .vscode/
 
 ### Mac OS ###
-.DS_Store
\ No newline at end of file
+.DS_Store
+
+/endpoints-output/**
\ No newline at end of file
diff --git a/parser/pom.xml b/parser/pom.xml
index 02c7c9c..a81607b 100644
--- a/parser/pom.xml
+++ b/parser/pom.xml
@@ -57,6 +57,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
+                <version>3.4.2</version>
                 <configuration>
                     <archive>
                         <manifest>
diff --git a/parser/src/main/antlr4/imports/Common.g4 b/parser/src/main/antlr4/imports/Common.g4
new file mode 100644
index 0000000..fbcbd0d
--- /dev/null
+++ b/parser/src/main/antlr4/imports/Common.g4
@@ -0,0 +1,40 @@
+// Copyright 2025 "Johan Maasing" <johan@zoom.nu>
+//
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//       http://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License.
+grammar Common;
+generatorconfig         : '{' (configitem)? (',' configitem)* '}';
+configitem              : configkey ':' configvalue ;
+configkey               : IDENTIFIER ;
+configvalue             : (IDENTIFIER|VALUE) ;
+namedTypeDeclaration    : typeName typeDeclaration ;
+typeName                : IDENTIFIER ;
+typeDeclaration         : '(' typeField (',' typeField)* ')' ;
+typeField               : fieldName ':' fieldType ;
+fieldName               : IDENTIFIER ;
+fieldType               : IDENTIFIER ;
+
+fragment LOWERCASE      : [a-z] ;
+fragment UPPERCASE      : [A-Z] ;
+fragment GENERICS       : '['|']'|'<'|'>' ;
+fragment DOT            : '.' ;
+fragment COMMENT_BEGIN  : '/*' ;
+fragment COMMENT_END    : '*/' ;
+fragment DIGIT          : [0-9] ;
+
+WS                      : [ \t\n\r]+ -> skip;
+COMMENT                 : COMMENT_BEGIN .*? COMMENT_END -> skip;
+IDENTIFIER              : (LOWERCASE | UPPERCASE) (LOWERCASE | UPPERCASE | DIGIT | GENERICS | DOT)* ;
+VALUE                   : ~[ ,{}:()/="#';*\n\r\t]+  ;
+LEFT_ARROW              : '<-' ;
+RIGHT_ARROW             : '->' ;
+SLASH                   : '/' ;
\ No newline at end of file
diff --git a/parser/src/main/antlr4/nu/zoom/dsl/parser/Endpoints.g4 b/parser/src/main/antlr4/nu/zoom/dsl/parser/Endpoints.g4
index 4f47bf8..f15a207 100644
--- a/parser/src/main/antlr4/nu/zoom/dsl/parser/Endpoints.g4
+++ b/parser/src/main/antlr4/nu/zoom/dsl/parser/Endpoints.g4
@@ -12,35 +12,12 @@
 //   See the License for the specific language governing permissions and
 //   limitations under the License.
 grammar Endpoints;
+import Common;
+
 document                : generatorconfig? (namedTypeDeclaration|endpoint)* ;
-generatorconfig         : '{' (configitem)? (',' configitem)* '}';
-configitem              : configkey ':' configvalue ;
-configkey               : IDENTIFIER ;
-configvalue             : (IDENTIFIER|VALUE) ;
-namedTypeDeclaration    : typeName typeDeclaration ;
-typeName                : IDENTIFIER ;
-typeDeclaration         : '(' typeField (',' typeField)* ')' ;
-typeField               : fieldName ':' fieldType ;
-fieldName               : IDENTIFIER ;
-fieldType               : IDENTIFIER ;
-requestBody             : REQUEST_PREFIX  (namedTypeDeclaration | typeDeclaration | IDENTIFIER) ;
-responseBody            : RESPONSE_PREFIX (namedTypeDeclaration | typeDeclaration | IDENTIFIER) ;
+requestBody             : LEFT_ARROW  (namedTypeDeclaration | typeDeclaration | IDENTIFIER) ;
+responseBody            : RIGHT_ARROW (namedTypeDeclaration | typeDeclaration | IDENTIFIER) ;
 endpoint                : path requestBody responseBody?;
 path                    : (pathSegment)+ ;
 pathSegment             : SLASH (IDENTIFIER|VALUE) ;
 
-
-fragment DIGIT          : [0-9] ;
-fragment LOWERCASE      : [a-z] ;
-fragment UPPERCASE      : [A-Z] ;
-fragment GENERICS       : '['|']'|'<'|'>' ;
-fragment DOT            : '.' ;
-fragment COMMENT_BEGIN  : '/*' ;
-fragment COMMENT_END    : '*/' ;
-WS                      : [ \t\n\r]+ -> skip;
-COMMENT                 : COMMENT_BEGIN .*? COMMENT_END -> skip;
-REQUEST_PREFIX          : '<-' ;
-RESPONSE_PREFIX         : '->' ;
-SLASH                   : '/' ;
-IDENTIFIER              : (LOWERCASE | UPPERCASE) (LOWERCASE | UPPERCASE | DIGIT | GENERICS | DOT)* ;
-VALUE                   : ~[ ,{}:()/="#';*\n\r\t]+  ;