Add AbstractDataFactory