diff --git a/jpars.script.clojure/src/main/java/example/application.clj b/jpars.script.clojure/src/main/java/example/application.clj
index 922e1e8..53b4ff2 100644
--- a/jpars.script.clojure/src/main/java/example/application.clj
+++ b/jpars.script.clojure/src/main/java/example/application.clj
@@ -1,9 +1,11 @@
 ; example.clj
 (ns example)
+
+(import org.eclipse.persistence.script.PersistenceUnit)
  
 (defn createService [name]
 	
-	(let  [pu (new org.eclipse.persistence.script.PersistenceUnit "test-1")]
+	(let  [pu (PersistenceUnit. "test-1")]
 		(.setDataSource pu "java:app/env/DS")
 		
 		(let [person (.addType pu "Person")]
@@ -11,8 +13,5 @@
         	(.basic person "name", nil, "NAME")
 		)
 		
-		(.create pu "v1.0" "create-or-extend-tables"))
-	
-	(example.CreateDataService/create "test-2")
-)
+		(.create pu "v1.0" "create-or-extend-tables")))
 
diff --git a/jpars.script.clojure/src/main/java/org/eclipse/persistence/script/PersistenceUnit.java b/jpars.script.clojure/src/main/java/org/eclipse/persistence/script/PersistenceUnit.java
index 9dad433..bdd6b31 100644
--- a/jpars.script.clojure/src/main/java/org/eclipse/persistence/script/PersistenceUnit.java
+++ b/jpars.script.clojure/src/main/java/org/eclipse/persistence/script/PersistenceUnit.java
@@ -160,7 +160,7 @@
         p.put(PersistenceUnitProperties.CLASSLOADER, dcl);
         p.put(PersistenceUnitProperties.WEAVING, "static");
         p.put(PersistenceUnitProperties.LOGGING_LEVEL, SessionLog.FINE_LABEL);
-
+        
         info.setProperties(p);
 
         if (EntityManagerFactoryProvider.getEmSetupImpls().containsKey(getName())) {
@@ -172,7 +172,12 @@
 
         EntityManagerSetupImpl setup = new EntityManagerSetupImpl(getName(), getName());
         setup.predeploy(info, props);
-        DatabaseSessionImpl sessionImpl = setup.deploy(dcl, props);
+        
+        // call to setup.deploy prevents execution of prelogin. Prelogin must be run to
+        // get JPA-RS mappings populated correctly
+        //DatabaseSessionImpl sessionImpl = setup.deploy(dcl, props);
+        
+        DatabaseSessionImpl sessionImpl = setup.getSession();
 
         if (EntityManagerFactoryProvider.getEmSetupImpls().containsKey(getName())) {
             EntityManagerFactoryProvider.getEmSetupImpls().put(getName(), setup);