Add a Factory for legacy application