Update to Architectureç