Added URL resolver