MediaParser refactored