Remade SAPIFactory
Fix for rename