AppContext improvements