UPDATE Refactoring