Diagrams and data dictionary fixed