Major changes to IF conditionas, and support for reusable triggers