Added supervisor basic feature