Fix generator issues

Generator needs to add a new line after the registration call, and instantiate the handler.