adding java 8 support