removed unnecessary DataSource class from model