Migrated to Java 1.6.