Even more changes for reuseable stateful sessions