Move to Java configuration