improved image support