Improved grafana support