Update refactor