Base class changed to ISensor