Ammended relationship map objects and populate dbsets correctly via reflection
Fixed post refactor build issues