Added support for ReferenceField