Restructure inheritance more appropriately