Added multi channel support