Added basic support for images