Refactor cc and bcc fields