Architecture: further refinements