Migrated to Java 6