Minor modifications to diagrams. No changes to schema