Added supervisor support