Adding java 8 support