Adding support for Java 1.6