Added app architecture