Added some more  types