Refactored update function calls