Added video handling