Update to support jdk1.6