Use State as embedded to Container

No logic changed.