Changed apiFactory