refactored location dictionary provider