add support for timed-operations (wait_for/wait_until)