Added generic image support