Include missing images
Improve file mapping