diff --git a/heron/api/src/java/BUILD b/heron/api/src/java/BUILD
index 0ae795f..d300286 100644
--- a/heron/api/src/java/BUILD
+++ b/heron/api/src/java/BUILD
@@ -38,7 +38,7 @@
     ]
 )
 
-# Functional Api
+# Low level and functional Api
 java_library(
     name = "api-java-low-level-functional",
     javacopts = DOCLINT_HTML_AND_SYNTAX,
diff --git a/heron/simulator/src/java/BUILD b/heron/simulator/src/java/BUILD
index 1239b4a..232e170 100644
--- a/heron/simulator/src/java/BUILD
+++ b/heron/simulator/src/java/BUILD
@@ -2,6 +2,16 @@
 
 package(default_visibility = ["//visibility:public"])
 
+load("//tools/rules:build_defs.bzl", "DOCLINT_HTML_AND_SYNTAX")
+load("//tools/rules:javadoc.bzl", "java_doc")
+
+java_doc(
+    name = "heron-simulator-javadoc",
+    libs = [":simulator-java"],
+    pkgs = ["org/apache/heron"],
+    title = "Heron Simulator Documentation",
+)
+
 simulator_deps_files = \
     heron_java_proto_files() + [
         "//heron/api/src/java:api-java-low-level",
@@ -14,6 +24,7 @@
 
 java_library(
     name = "simulator-java",
+    javacopts = DOCLINT_HTML_AND_SYNTAX,
     srcs = glob(["**/*.java"]),
     deps = simulator_deps_files,
 )
diff --git a/release/maven/maven-pom-version.sh b/release/maven/maven-pom-version.sh
index 3816896..8788f9f 100755
--- a/release/maven/maven-pom-version.sh
+++ b/release/maven/maven-pom-version.sh
@@ -44,3 +44,9 @@
     sed "s/DESCRIPTION/Heron Storm/g" \
     >> ./heron-storm-$1.pom
 
+cat ./maven/heron-with-kryo.template.pom | \
+    sed "s/VERSION/$1/g" | \
+    sed "s/ARTIFACT_ID/heron-simulator/g" | \
+    sed "s/NAME/heron-simulator/g" | \
+    sed "s/DESCRIPTION/Heron Simulator/g" \
+    >> ./heron-simulator-$1.pom