Updated for jdkV3