Better handling of connector requests