Update to use java 8