With working factory. Next do arg check for api dev