Add wait loop to init step