Moving to Java 1.6