Added link and image fields