Adapted to the last class path changes.