Updating createContext to match the core spec (work-in-progress)