restructuring
session support