Added suport for media URLs