Migrated to Java 1.8