Add external services v2 support.