Use rust-url types instead of Strings