Make the media abstraction smarter