Added full app architecture