Added conditionFactory and WrongArgException