fix(Condition): use update logic for applying condtions

fix(Condition): use update logic for applying condtions #157