Refactor Context to AppContext
Fix 1.9.3