New model - bundle and minor changes in generated files