Refactoring update process

Change-Id: I7a6fc58ccffc0c7752779a759c76bdade84ceb9a