Added some more base-url generating magic