Rework associations