Update tool to export json and image data with entity Id in name.