VID-1904 adding specificity to image and video classes