Updated the architecture