Refactor Commerce 'Managers'