Rewrote the architecture file (#1908)