Improve inheritance hierarchies