Better handling of default client type