Refactoreed services to ensure typed tokens in response for typed handlers