Refactored stings for URLs
With separate auth