VID-1810 Add more comments