Modified aspects of the core framework that were impacted by the switch to the capability/requirement model. (FELIX-28)