Added more data types to the application