Flattened some hierarchy