Add ChannelList and Source object
Fix some ettors