Minor Update: architecture