Added comments and support for channels