Added Video flagging support