Added destructor support