Datasource refactor
Version 1.4.2
Merge branch 'further-1.4'