Models/DataContext.cs: corrections and modifications