Looking after CMAP parsing