Adding type hierarchy