[#2061] support more data types