Better update management