Added java 6 compat