Move to java 7