Fixed Connection and Session according to new convention.