System Architecture updated