Added some more supported types