Update for JDK 1.6 compatibility