Change DB to fetch data from, add fields to output