Updated DataModel, Renamed Nodes in Functional Requirements