Added support of Java 1.6