Migrate to Java 7