Migrated to Java 7 / 1.7