Migrating to JavaBased Config