Add MediaType checks and sets