add support for data factory