Added some new classes to hierarchy.