DEV: Migrate to Java8