Added collector, sensor, and reading support.