First attempt at the datasources interface
Merge remote-tracking branch 'origin/master'