Modularize changes with the code