Move to Java 7