Switching to Java 7