Supporting embedded fields.
Updated test coverage for Ref fields