changes and additions from GAP-Test to mandatory data objects and fields