Changing implementation for url to align with spec