New session/new source and support for safer session saving.