Refactoring the Staff override functionality.

TNL-898 & TNL-899