Updated project to use Java 8