4/18 update type hierarchy.