[Improved] Association update