Migrate to Java 1.7