Moving to Java configuration