Modify architecture