Adding SafeReferenceField