Added instrumentation to save and destroy.