Move to Java 1.6 from Java 1.7