Added Solve Media support