We could change the id, but it's safer to require that in case the service is not a singleton. What would you suggest ("xd_data_source")?