XD-6 Channel Registry

Updated PR for Channel Registry XD-32, XD-33