External integration switch logic, close suggestion issue #138.