Added image support