Updated to java7