Add: support for references changing on update