Added video/embeded content support