Fix and include DataSource class