Architecture updated