Architectural Types Revisited: Extensible And/Or Connections