Adds UUID Residence support