Fixing classes for manager handling