Switch Java 6 to 7