Looking into splitting hierarchy out