Add code to support session