Added support for supervisors