Add support for more mpeg types