Fix issue with DataSource not extending DataArray