Improved schema2classes