Update for JDK6