Update for new reference resolver