Supervisor accounts refactored