Add new saving context functions