Relations added to data model
Data model cleanup