Fix: Refactoring for Condition Selection