RelatedTo mapping fixed