Fixed ambiguous associations in class