Added additional type support.