Migrated to Java 1.7