Added support for ReferenceValueTypes