First version of ControlState support