Added generation of states for every await call