Migrating to Java 7