Added mapping for CtrlPBufTags