Added Or to parser to support BDJ extension