Now working on more data types