Move the session specific setup to the service