Started adding StateInfo to specify states