Added additional types.