Finishing LocationCatalog