Adapted to new Inheritance