Added metrics, measures, and finalizer