Updated URL handling