Organize update() methods