Adding support for references.