[UPDATE] app architecture v4