Added DataSource class and Model class