Enhanced location management