Update for jvm6