Improving Session support