Refactoring - staff to system