Updates to State nodes to make them more flexible