Data source as services
Merge pull request #1 from Edorka/master

Data source as services