Renamed diagrams. Added proxy pattern.