Removed the headers, time_stamp, data_format functionality. It might get added later on, but for know I wanted to simplify the query.