Adding Supervisor support