Fixed to use class Inheritance