Updates to state initialization