Diagrams added, some states ids changed