Fixed the relations in master

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