Refactored media architecture