Updated to latest version of channel api from the Morey's project