New version of oFactory