Add support for external data retrieval