Simplify Location management