Added basic architecture