Better image support.