Added Support for JDK 1.8