Updates to support first full draft of CBA content.