Migrated to Java 7