Move session mgmt to the right