AF-30: Create new AppContextModel
changes based on code review