Revamp ChannelMapper for eased usage
Merge branch 'MapRevamp'