Make updates smarter