Working on the new hierarchy.