Added new types in hierarchy