Some correction about the changement of the datasources