Locations refactoring