Adapted to the latest classpath changes.