Start moving to java 1.7