JDK 8 migrations