Small change to work with Metrics and allow a reset