Manager improvements - in progress