Added or and to code gen