More class changes to Managers