Added ModelGenerator
Added FilterGenerator