Added more data types