changed inheritance relations to match core changes