Use AfterResolveReferences