DC21-272: Refactor facility contacts