add wait support to v3