New snippets + small fix for session