JDK 1.8 migration - preliminary