More architecture edits