Moving to jdk 7