7bebd62446
* update datasource info struct name * remove unnecessary abstraction * update error messages
* update datasource info struct name * remove unnecessary abstraction * update error messages