Added/Refactored baseUrl methods on Parser/Url
Added/Refactored baseUrl methods on Parser/Url