Filenames are now included along with the header and image data, with all three elements being grouped together as lists