Change to Java 1.7