Some bug fixes + added support for explicit class generator registrar