#50 Handling sessions