Added finalization