Adding support for Java6
Adding support for Java6