Enhanced image handling.