Secretary controller refactor