Refactored DataContext.