Added java 8 stuff