Added remaining code needed to map data from the data model to the generated relational schema