Modify goes to accept scheme and remove port