Added latest changes and diagrams