added possibility to redefine waiter while using advanced dsl