Add mappings for CtrlPBuffer and CtrlPBufTag