Adapted to latest classpath changes.