Add serviceType to entities