Added java 8 support