New changes related to session