Datasources now returned as hashmaps