Changed the XML formatting to make it easier to add new control
channels.