All references updates