Changes related to session and validation