add location parsing