Re-added factory interface

Was missing since PR #5406