JDK8 support added