Small texts changes
Independent path and url builder