Refactor updates