Refactoring
Exposed the datasource list for Diego
Cleanup