Improved generation - breaks compatibility with previously generated models