diff --git a/README.md b/README.md
index 20babf07..a720252e 100644
--- a/README.md
+++ b/README.md
@@ -18,9 +18,8 @@ to parse and validate workflow definitions as well as generate the workflow diag
 
 | Latest Releases | Conformance to spec version |
 | :---: | :---: |
-| [1.0.1.Final](https://github.com/serverlessworkflow/sdk-java/releases/) | [v0.5](https://github.com/serverlessworkflow/specification/tree/0.5.x)  |
-| [1.0.2.Final](https://github.com/serverlessworkflow/sdk-java/releases/) | [v0.5](https://github.com/serverlessworkflow/specification/tree/0.5.x) + [Compensation support](https://github.com/serverlessworkflow/specification/blob/master/specification.md#Workflow-Compensation)  |
-| [1.0.3.Final](https://github.com/serverlessworkflow/sdk-java/releases/) | [v0.5](https://github.com/serverlessworkflow/specification/tree/0.5.x) + [Compensation support](https://github.com/serverlessworkflow/specification/blob/master/specification.md#Workflow-Compensation) + [Update to start/end definitions](https://github.com/serverlessworkflow/sdk-java/commit/1addf8d66450830cbc3542c8dfb968b3791aba6f)  |
+| [2.0.0.Final](https://github.com/serverlessworkflow/sdk-java/releases/) | [v0.6](https://github.com/serverlessworkflow/specification/tree/0.6.x) |
+| [1.0.3.Final](https://github.com/serverlessworkflow/sdk-java/releases/) | [v0.5](https://github.com/serverlessworkflow/specification/tree/0.5.x) |
 
 ### Getting Started
 
@@ -58,25 +57,25 @@ b) Add the following dependencies to your pom.xml `dependencies` section:
 <dependency>
     <groupId>io.serverlessworkflow</groupId>
     <artifactId>serverlessworkflow-api</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.x</version>
 </dependency>
 
 <dependency>
     <groupId>io.serverlessworkflow</groupId>
     <artifactId>serverlessworkflow-spi</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.x</version>
 </dependency>
 
 <dependency>
     <groupId>io.serverlessworkflow</groupId>
     <artifactId>serverlessworkflow-validation</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.x</version>
 </dependency>
 
 <dependency>
     <groupId>io.serverlessworkflow</groupId>
     <artifactId>serverlessworkflow-diagram</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.x</version>
 </dependency>
 ```
 
@@ -91,10 +90,10 @@ maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
 b) Add the following dependencies to your build.gradle `dependencies` section:
 
 ```text
-implementation("io.serverlessworkflow:serverlessworkflow-api:2.0.0-SNAPSHOT")
-implementation("io.serverlessworkflow:serverlessworkflow-spi:2.0.0-SNAPSHOT")
-implementation("io.serverlessworkflow:serverlessworkflow-validation:2.0.0-SNAPSHOT")
-implementation("io.serverlessworkflow:serverlessworkflow-diagram:2.0.0-SNAPSHOT")
+implementation("io.serverlessworkflow:serverlessworkflow-api:2.0.x")
+implementation("io.serverlessworkflow:serverlessworkflow-spi:2.0.x")
+implementation("io.serverlessworkflow:serverlessworkflow-validation:2.0.x")
+implementation("io.serverlessworkflow:serverlessworkflow-diagram:2.0.x")
 ```
 
 ### How to Use 
@@ -117,16 +116,15 @@ functions:
 states:
 - name: Greet
   type: operation
-  actionMode: sequential
   actions:
   - functionRef:
       refName: greetingFunction
       arguments:
-        name: ".greet.name"
+        name: "${ .greet.name }"
     actionDataFilter:
-      dataResultsPath: ".payload.greeting"
+      results: "${ .payload.greeting }"
   stateDataFilter:
-    output: ".greeting"
+    output: "${ .greeting }"
   end: true
 ```
 
@@ -158,7 +156,6 @@ assertTrue(workflow.getStates().get(0) instanceof OperationState);
 OperationState operationState = (OperationState) workflow.getStates().get(0);
 assertEquals("Greet", operationState.getName());
 assertEquals(DefaultState.Type.OPERATION, operationState.getType());
-
 ...
 ```
 
@@ -167,20 +164,21 @@ assertEquals(DefaultState.Type.OPERATION, operationState.getType());
 You can also programmatically create Workflow instances, for example:
 
 ``` java
-Workflow workflow = new Workflow().withId("test-workflow").withName("test-workflow-name").withVersion("1.0")
+Workflow workflow = new Workflow()
+                .withId("test-workflow")
+                .withName("test-workflow-name")
+                .withVersion("1.0")
+                .withStart(new Start().withStateName("MyDelayState"))
                 .withFunctions(new Functions(Arrays.asList(
                         new FunctionDefinition().withName("testFunction")
                                 .withOperation("testSwaggerDef#testOperationId")))
                 )
                 .withStates(Arrays.asList(
-                        new DelayState().withName("delayState").withType(DELAY)
-                                .withStart(
-                                        new Start().withKind(Start.Kind.DEFAULT)
-                                )
+                        new DelayState().withName("MyDelayState").withType(DELAY)
+                                .withTimeDelay("PT1M")
                                 .withEnd(
-                                        new End().withKind(End.Kind.DEFAULT)
+                                        new End().withTerminate(true)
                                 )
-                                .withTimeDelay("PT1M")
                         )
                 );
 ```
@@ -218,16 +216,16 @@ boolean isValidWorkflow = workflowValidator.setSource("WORKFLOW_MODEL_JSON/YAML"
 If you build your Workflow programmatically, you can validate it as well:
 
 ``` java
-Workflow workflow = new Workflow().withId("test-workflow").withVersion("1.0")
+Workflow workflow = new Workflow()
+                .withId("test-workflow")
+                .withVersion("1.0")
+                .withStart(new Start().withStateName("MyDelayState"))
                 .withStates(Arrays.asList(
-                        new DelayState().withName("delayState").withType(DefaultState.Type.DELAY)
-                                .withStart(
-                                        new Start().withKind(Start.Kind.DEFAULT)
-                                )
+                        new DelayState().withName("MyDelayState").withType(DefaultState.Type.DELAY)
+                                .withTimeDelay("PT1M")
                                 .withEnd(
-                                        new End().withKind(End.Kind.DEFAULT)
+                                        new End().withTerminate(true)
                                 )
-                                .withTimeDelay("PT1M")
                 ));
 );
 
diff --git a/api/pom.xml b/api/pom.xml
index aa480f4e..9a698fd9 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -6,11 +6,13 @@
     <parent>
         <groupId>io.serverlessworkflow</groupId>
         <artifactId>serverlessworkflow-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.x</version>
     </parent>
 
     <artifactId>serverlessworkflow-api</artifactId>
     <name>Serverless Workflow :: API</name>
+    <version>${project.parent.version}</version>
+    <packaging>jar</packaging>
     <description>Java SDK for Serverless Workflow Specification</description>
 
     <dependencies>
@@ -18,6 +20,10 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
diff --git a/diagram/pom.xml b/diagram/pom.xml
index e89a9cde..67e0151a 100644
--- a/diagram/pom.xml
+++ b/diagram/pom.xml
@@ -6,11 +6,13 @@
     <parent>
         <groupId>io.serverlessworkflow</groupId>
         <artifactId>serverlessworkflow-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.x</version>
     </parent>
 
     <artifactId>serverlessworkflow-diagram</artifactId>
     <name>Serverless Workflow :: Diagram</name>
+    <version>${project.parent.version}</version>
+    <packaging>jar</packaging>
     <description>Java SDK for Serverless Workflow Specification</description>
 
     <dependencies>
diff --git a/pom.xml b/pom.xml
index f6da6784..233b11e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>io.serverlessworkflow</groupId>
     <artifactId>serverlessworkflow-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.x</version>
     <packaging>pom</packaging>
 
     <name>Serverless Workflow :: Parent</name>
@@ -24,6 +24,20 @@
         </license>
     </licenses>
 
+    <scm>
+        <connection>scm:git:git://github.com/serverlessworkflow/sdk-java.git</connection>
+        <developerConnection>scm:git:git@github.com:serverlessworkflow/sdk-java.git</developerConnection>
+        <url>https://github.com/serverlessworkflow/sdk-java</url>
+    </scm>
+
+    <developers>
+        <developer>
+            <id>tsurdilo</id>
+            <name>Tihomir Surdilovic</name>
+        </developer>
+    </developers>
+
+
     <modules>
         <module>api</module>
         <module>spi</module>
@@ -71,6 +85,11 @@
                 <artifactId>slf4j-api</artifactId>
                 <version>${version.org.slf4j}</version>
             </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>jcl-over-slf4j</artifactId>
+                <version>${version.org.slf4j}</version>
+            </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-core</artifactId>
@@ -100,6 +119,12 @@
                 <groupId>com.github.erosb</groupId>
                 <artifactId>everit-json-schema</artifactId>
                 <version>${json.schema.validation.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.json</groupId>
@@ -175,7 +200,6 @@
     </dependencyManagement>
 
     <build>
-        <pluginManagement>
             <plugins>
                 <plugin>
                     <artifactId>maven-deploy-plugin</artifactId>
@@ -233,14 +257,56 @@
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-failsafe-plugin</artifactId>
-                    <version>${version.failsafe.plugin}</version>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <version>3.0.1</version>
+                    <executions>
+                        <execution>
+                            <id>attach-sources</id>
+                            <goals>
+                                <goal>jar</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>2.10.4</version>
                     <configuration>
-                       <argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>
+                        <source>8</source>
+                        <additionalparam>-Xdoclint:none</additionalparam>
                     </configuration>
+                    <executions>
+                        <execution>
+                            <id>attach-javadocs</id>
+                            <goals>
+                                <goal>jar</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-gpg-plugin</artifactId>
+                    <version>1.6</version>
+                    <executions>
+                        <execution>
+                            <id>sign-artifacts</id>
+                            <phase>verify</phase>
+                            <goals>
+                                <goal>sign</goal>
+                            </goals>
+                            <configuration>
+                                <gpgArguments>
+                                    <arg>--batch</arg>
+                                    <arg>--pinentry-mode</arg>
+                                    <arg>loopback</arg>
+                                </gpgArguments>
+                            </configuration>
+                        </execution>
+                    </executions>
                 </plugin>
             </plugins>
-        </pluginManagement>
     </build>
 
     <distributionManagement>
diff --git a/spi/pom.xml b/spi/pom.xml
index da5821a8..2f267f03 100644
--- a/spi/pom.xml
+++ b/spi/pom.xml
@@ -6,11 +6,13 @@
     <parent>
         <groupId>io.serverlessworkflow</groupId>
         <artifactId>serverlessworkflow-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.x</version>
     </parent>
 
     <artifactId>serverlessworkflow-spi</artifactId>
     <name>Serverless Workflow :: SPI</name>
+    <version>${project.parent.version}</version>
+    <packaging>jar</packaging>
     <description>Java SDK for Serverless Workflow Specification</description>
 
     <dependencies>
diff --git a/validation/pom.xml b/validation/pom.xml
index 887b9705..d083dff2 100644
--- a/validation/pom.xml
+++ b/validation/pom.xml
@@ -6,11 +6,13 @@
     <parent>
         <groupId>io.serverlessworkflow</groupId>
         <artifactId>serverlessworkflow-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.x</version>
     </parent>
 
     <artifactId>serverlessworkflow-validation</artifactId>
     <name>Serverless Workflow :: Validation</name>
+    <version>${project.parent.version}</version>
+    <packaging>jar</packaging>
     <description>Java SDK for Serverless Workflow Specification</description>
 
     <dependencies>
@@ -18,6 +20,10 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>io.serverlessworkflow</groupId>