Improving multi-media support