Modify inheritence structure