added legacy url support