Refactored update calls