Change to Java 7