Added image support and image uploading feature