Add support for rest of data types