Upgraded to Java 7