Updated to new version of datasources interfaces