Improve update process