Fill architecture part a bit