Fixed listings for new locations, removed high level impl dependencies