Adapted to changes in package manager