Updates for errors prev
first commit for datasource configuration.
Update changes for datasource configuration
fixing bugs