Added manager support