Start refactoring the Context object