Added Media object and refactored reading result components