Improved update handling and deferred resolution