Added supervisor feature