Migrated to JDK8