Update tools
Fix define for classes