Architectural updates