Improved support for association update.