Refactored location services