Added java 1.6 support