Adjust the inheritance structure