Changed name-scheme for enums
Change Relationship map format and add unittests