Image structure, comment structure, and image handling added