Merge "Correct a reference to VID and add modeling"