Refactored Media Overlay model