Support more types