[PATCH 0/8] More CCI Mappings