Manager improvements