Improve inheritance hierarchy