Datasource cleanup: introduce some types and avoid pass-by-context

Datasource cleanup: introduce some types and avoid pass-by-context #3125