Add basic hierarchy and grouping
Don't count registry records