Adapted to the latest classpath change.