Added more types to data_types