Added isSupervisor check