Added session tracking