Refactor service type to kass mapping