Changed the proposed architecture