Staff Manager refactor