Adding support for Managers