*** TEST RELEASE - Updated handling of associations