Added support to $relatedTo