Added back in handling for facility locations