Switched to URLs instead of Strings