Added AndX and OrX to ODM