Refactor update sequence