Support for jdk8
Returning to jdk 7