Changes on ISupervisor API