Changes to the State Module