Refactor of Conditional update mechanism
Refactor of Computed update mechanism