Added if, or and and as supported forms for lift