Session handling added