[TASK] Refactor If scope to Condition scope with NS