- Fix code
- Initial commit for destructor support