Refactored condition property