change tariff input structure to allow for hybrid tariffs and add a fixed charge attribute to all tariffs