Refactor generation tool to add addons templates