Added experimental media handling support