Keep single API for deprecated: now it is always factory