[IMPROVEMENT] Image file handler