Replaced hard-coded locations with GaspLocationService