Adding more data types