Changed DataContext's base class