Added supervisor part