Updated the Data module so that it only sends the correct data on query