Added text and image support