Added sample session handling