Improve multi-media support