Revised architecture diagram