Small changes for sending the data type to the data service