Updated Solution Architecture