Renaming context to factory