Adding channel sampling support