Updated all URLs according to new requirements