Added some kind of image support