Added lifting of and and or macros