Refactor other managers