added more data types