Improved Arbiter's handling of media