Class name change to session, to avoid merging for now