Changes needed for new package system.