[UPDATE] Adding architecture