hub media refactoring