Move to java 1.7