Added image and enhanced file naming