Small architect changes