Changed to use baseurl property.