Added additional types