Switch to JAVA 7