change domain model to have more relationship types, therefore avoiding the need for some label checks