Make state representation more UML like.