Add media object mixin
Tweak comment