Changes to Managers/Entities