Adding support for overstates