adding support for java 8