improved schema generation for ORM utility classes
improved ORM utility classes