update to generate correct choice classes and update entity template to generate the all entities list; version 4.0.7