Adding CCI support to Mercury