Add resolve tracking to associations