LOW: Adapt to refactored Factory API