Instead of modifying the affecting files. While we set on a strategy on how to approach this situations.