[TASK] Refactored ClassSchema