Refactoring of storage class, shared_ptr hidden