Hierarchical & type views completed