Move serviceType affectation to common