Adapted to changes in repository manager