Converting project to use Java 1.7