This dramatically improves maintainability of generated files. This will be eventually implemented on other generated files as well.