Improve session handling in trading system