Reduce complexity of update method