Adding deallocators