Updated Media Manager