add support for sameAs fields