Added semi-working version of the DataSource