VID-241 New schema for video swap feature