Significant improvements to associations handling