Move calculations to sessionService.