Adding image support