Fix State data structure

Refs #1