Add port number to url generation