Fix breakage on DataSource