Updated Associations hook