Move to Java 6