Much better image support.