Refactor more managers