Added reference-attributes support