CAAERS-6585 -updated for additional elements
CAAERS-6584 - update schema
CAAERS-6586 - update to consume additional E2B elements