Integrade generator in app.
Fix NPE with annotation to make better fix.