Improved schema2classes
Improved schema2classes