Energy dashboard additions

I like the energy dashboard, but I would like to request some features:

  1. Our tariff’s are build up by a prices per watt or m3 and a fixed fee per day, could this be implemented in a future release?

  2. I’ve got a watermeter, could this be implemented in a future release? (This has a prices per liter/m3 and a fixed price per year).