Added multiple Media Types support