Updated to new version of datasources interface