Added data stores and some tableview delegate methods