Improve channels definition, update templates