Update wait to use --status