Adding support for related fields