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