Updated with image support