Updated processor and model
Fixed model bug
Route events
Simplify generators