Restructured location mgmt