Adapted to the latest class path changes.