Updated diagrams and fixed the cyclic dependency.