Moving to Java 7