Added the ApiFactory