markAsClassFactory renamed to classFactory