Add basic media handling