Refactored design to increase flexibility of adding sensors/channels