Update to SF DataSource