Add support for external services