Added Datacenter and location to models