Add a small part of the architectual change