made MediaService  refactoring