Add support for more data types