Improved sessions controller