Merge pull request #7 from mdrillin/master

Sync with 6.0.0 datasource changes