Add Session management