Inheritance refactor#14