Updated managers for more consistent hierarchy