Adding more state info