#179: More work on bulk data files