Updated DataModels and Added DBContext