Improve sessions