Added support for OR/AND keys in conditions