Added the inheritance hierarchy