Reordering of datasource types