Added some basic architecture