Start to add session support