Added a context creator