Add support for external source