Added support for external data lookup