Further architecture refinements according to discussions