DataSource class was added