Initial work to add location/datacenter