Adding State and StateTable