Changed structure for baseurl