Added company location parsing