added more media support