Rename struct
Define StateSet