Update waiters to v2 format