Refactored Condition workflow