Updated content and image support.