Add more data types