New routing with client types