Improved ExtendedConditionHelper