diff --git a/appengine-modules-ear/pom.xml b/appengine-modules-ear/pom.xml
index 5ba8e82..20c690d 100644
--- a/appengine-modules-ear/pom.xml
+++ b/appengine-modules-ear/pom.xml
@@ -21,8 +21,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>2.5.1</version>
         <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
+          <source>${java.version}</source>
+          <target>${java.version}</target>
         </configuration>
       </plugin>
       <plugin>
@@ -39,7 +39,7 @@
       <plugin>
         <groupId>com.google.appengine</groupId>
         <artifactId>appengine-maven-plugin</artifactId>
-      <version>1.9.0</version>
+      <version>${appengine.target.version}</version>
       </plugin>
     </plugins>
   </build>
diff --git a/appengine-modules-guestbook/pom.xml b/appengine-modules-guestbook/pom.xml
index a42329b..372586e 100644
--- a/appengine-modules-guestbook/pom.xml
+++ b/appengine-modules-guestbook/pom.xml
@@ -69,8 +69,8 @@
         <version>2.5.1</version>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
+          <source>${java.version}</source>
+          <target>${java.version}</target>
         </configuration>
       </plugin>
 
@@ -78,8 +78,18 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
         <version>2.3</version>
+        <configuration>
+            <archiveClasses>false</archiveClasses>
+            <webResources>
+                <!-- in order to interpolate version from pom into appengine-web.xml -->
+                <resource>
+                    <directory>${basedir}/src/main/webapp/WEB-INF</directory>
+                    <filtering>true</filtering>
+                    <targetPath>WEB-INF</targetPath>
+                </resource>
+            </webResources>
+        </configuration>
       </plugin>
-
       <plugin>
         <groupId>com.google.appengine</groupId>
         <artifactId>appengine-maven-plugin</artifactId>
diff --git a/appengine-modules-guestbook/src/main/webapp/WEB-INF/appengine-web.xml b/appengine-modules-guestbook/src/main/webapp/WEB-INF/appengine-web.xml
index 876171a..d96be1a 100644
--- a/appengine-modules-guestbook/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/appengine-modules-guestbook/src/main/webapp/WEB-INF/appengine-web.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
   <application>guestbook</application>
-  <version>1</version>
+  <version>${appengine.app.version}</version>
   <threadsafe>true</threadsafe>
     
-  <module>guestbook</module>
+  <module>default</module>
   <system-properties>
     <property name="java.util.logging.config.file" value="WEB-INF/logging.properties"/>
   </system-properties>
diff --git a/appengine-modules-guestbook/src/main/webapp/guestbook.jsp b/appengine-modules-guestbook/src/main/webapp/guestbook.jsp
index 20b4297..46ebdd1 100644
--- a/appengine-modules-guestbook/src/main/webapp/guestbook.jsp
+++ b/appengine-modules-guestbook/src/main/webapp/guestbook.jsp
@@ -9,6 +9,8 @@
 <%@ page import="com.google.appengine.api.users.User" %>
 <%@ page import="com.google.appengine.api.users.UserService" %>
 <%@ page import="com.google.appengine.api.users.UserServiceFactory" %>
+<%@ page import="com.google.appengine.api.modules.ModulesService" %>
+<%@ page import="com.google.appengine.api.modules.ModulesServiceFactory" %>
 <%@ page import="java.util.List" %>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 
@@ -89,5 +91,13 @@
     <div><input type="submit" value="Switch Guestbook"/></div>
 </form>
 
+<%
+	ModulesService modulesService = ModulesServiceFactory.getModulesService();
+	String currentVersion = modulesService.getCurrentVersion();
+	String linkToOtherModule = modulesService.getVersionHostname("shardedcounter", currentVersion);
+%>
+
+	<a href="http://<%=linkToOtherModule %>">Link to other Module</a>
+
 </body>
 </html>
diff --git a/appengine-modules-shardedcounter/pom.xml b/appengine-modules-shardedcounter/pom.xml
index 04cea91..fe2ddab 100644
--- a/appengine-modules-shardedcounter/pom.xml
+++ b/appengine-modules-shardedcounter/pom.xml
@@ -77,8 +77,8 @@
                 <version>2.5.1</version>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/appengine-modules-shardedcounter/src/main/webapp/WEB-INF/appengine-web.xml b/appengine-modules-shardedcounter/src/main/webapp/WEB-INF/appengine-web.xml
index 2c187b6..582f5c2 100644
--- a/appengine-modules-shardedcounter/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/appengine-modules-shardedcounter/src/main/webapp/WEB-INF/appengine-web.xml
@@ -1,6 +1,6 @@
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
   <application>yet-another-sharded-counter</application>
-  <version>1</version>
+  <version>${appengine.app.version}</version>
   <threadsafe>true</threadsafe>
     
   <module>shardedcounter</module>
diff --git a/pom.xml b/pom.xml
index 360f6d5..bbe5f3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,8 +9,9 @@
   
   <properties>
     <appengine.app.version>1</appengine.app.version>
-    <appengine.target.version>1.9.0</appengine.target.version>
+    <appengine.target.version>1.9.4</appengine.target.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <java.version>1.7</java.version>
   </properties>
   <modules>
     <module>appengine-modules-ear</module>