* Adding line mappings for @inject generated properties
* Changes per code review feedback