Added some more state info