Architecture Specification - Updated