Move to Java 1.7