Changed how the different data sources are managed, now are merged in one single layer, not sure it is the best thing