Add support for images