Added finalization event for client