Feature/fofis factory