Implemented the new form of createContext, removed the old one.