Add wait/poll steps for crud operations