Improved compatibility with new class creator.
Continued work on builder.  It's almost done now.