modified the code for data types