Improve support for images