Meta-data: fixed type hierarchy according the new design.