Small changes to add session.