Cleaned up dependencies
Allow multiple containers to be created in JVM