Add wait bindings