Changes to generics on hierarchy events