Temp commit: Support for image filenames