More optimization for images