Added Support for Session Tracking