Support more data types