Moved to Java 6