Add audio/video support and bail on findings