Added improved handling of zfs related data.