Improve architecture diagram