Java 1.6 support