preparing for multi datasource types handling
small issue
Merge pull request #1 from youknowriad/master

preparing for multi datasource types handling