Added some type hierarchy goodness