removed unnecessary lines and changed evaluatedContainedDataDefinitions tye from List to Map so that we can retrieve the appropriate data by key