Eliminate FutureDataFactory