Added updating of baseurl