Add buckets for CMS key pairs