Migrating to single JVM setup