Architecture

#2:

Change request updated