Updated SW Architecture Diagrams