ADDED MORE MANAGER SUPPORT