Fixed api factory