Improving support for references