Added more opportunities to dump data