Ticket #179 adding data fees