Use URL type in more places