Some refactoring: DataContext is now a singleton.