Improvements to object associations.