Implementing new class hook system
Typos