Do value checking
Add video support