Better handling of the servers