Refactoring 21 QTI
Refactoring 22 QTI