ClazzFactory refac