Migrating to Java EE format