Made it jdk 1.6 compatible.