Adds some long living session support