Added JDK8 Support