Continue refactoring media/playlist