Switch to java7