Added url resolver