Added various sources + video support