Schema and main library update to support BCC and CC.