- Initial commit for destructor support