Correct the architectural ambiguity