Allow for custom Graphite handler and clean up template