Refactoring Sensor system

Sensor system has been refactored to better support suffixes