Fixed the relations in master, #120

Some relationships overwritted others, so they had to be redefined.